diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 60fea59..e7ae18e 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -314,7 +314,7 @@
  * shorted - index 1
  * Retain non-DM serial port for debug purposes.
  */
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_CLK		(get_bus_freq(0) / 2)
 #define CFG_SYS_NS16550_COM1	(CFG_SYS_CCSRBAR + 0x11C500)
 #endif
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index fa275d6..3dfcb13 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -33,7 +33,7 @@
  * NS16550 Configuration
  */
 #define CFG_SYS_NS16550_CLK		CFG_SYS_TCLK
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index eae107f..8032abe 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -23,7 +23,7 @@
 #else
 #define CFG_SYS_NS16550_CLK		24000000
 #endif
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 # define CFG_SYS_NS16550_COM1		SUNXI_UART0_BASE
 # define CFG_SYS_NS16550_COM2		SUNXI_UART1_BASE
 # define CFG_SYS_NS16550_COM3		SUNXI_UART2_BASE
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 49f4263..9e312ac 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -28,7 +28,7 @@
  * Hardware drivers
  */
 #define CFG_SYS_NS16550_CLK		48000000
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM3		UART3_BASE
 #endif
 
diff --git a/include/configs/x530.h b/include/configs/x530.h
index fddf00d..e1678e7 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -14,7 +14,7 @@
  * NS16550 Configuration
  */
 #define CFG_SYS_NS16550_CLK		CFG_SYS_TCLK
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif